Merge from origin/emacs-28

e77fc8262a Update to Org 9.5.2-22-g33543d
9bce4b67f1 ; * lisp/help.el (with-help-window): Doc fix.  (Bug#54170)
558b03a958 Add explicit '--no-heading' for ripgrep

diff --cc lisp/help.el
Simple merge

diff --cc lisp/org/ol.el
Simple merge

diff --cc lisp/org/org.el
Simple merge

diff --cc lisp/progmodes/xref.el
Simple merge